gmoccapy: exit cleanly on termination signal instead of error dialog#4076
Open
grandixximo wants to merge 1 commit into
Open
gmoccapy: exit cleanly on termination signal instead of error dialog#4076grandixximo wants to merge 1 commit into
grandixximo wants to merge 1 commit into
Conversation
gmoccapy did not exit on SIGTERM; callers had to escalate to SIGKILL. Root cause: PyGObject's signal bridge surfaces a termination signal into the GTK main loop as a Python KeyboardInterrupt. That propagated to the installed sys.excepthook, which unconditionally popped a modal 'Found an error ... KeyboardInterrupt' dialog and blocked in the dialog's nested loop, so the process never quit. Handle KeyboardInterrupt at the top of excepthook: log it and quit the main loop instead of showing the modal error dialog. Verified that gmoccapy now exits cleanly on SIGTERM (no SIGKILL escalation, no spurious error-dialog traceback). The previous broken 'except KeyboardInterrupt' on the window lookup (which could never fire there) is removed. Surfaced by the ui-smoke tests (PR LinuxCNC#4054). Fixes LinuxCNC#4069
5 tasks
grandixximo
added a commit
to grandixximo/linuxcnc
that referenced
this pull request
Jun 1, 2026
Adds a quit-path smoke test per GUI that boots the GUI, waits for the NML task to come up, sends SIGTERM to the GUI process alone, and asserts the GUI exits on its own within a short grace. This guards the clean-shutdown handlers: a GUI that absorbs SIGTERM and has to be SIGKILLed fails the test. The new _lib/quit-launch.sh shares the headless environment (software GL + audio silencing) with launch.sh by sourcing a new _lib/launch-env.sh rather than copying it, so the two launchers cannot drift apart. Results go through _lib/checkresult-quit.sh (pass on UI_SMOKE_QUIT_OK). The GUI process is identified by matching a python argv[0], so the linuxcnc launcher and xvfb-run wrappers that also carry the GUI name on their command line are not mistaken for it. Per-GUI dirs: touchy-quit, gmoccapy-quit, qtdragon-quit. The qtdragon quit test needs the same CI workarounds the qtdragon smoke test already carries (writable config mirror with a patched LOG_FILE, the offscreen Qt platform, and the QtWebEngine import shim). Those move out of qtdragon/test.sh into _lib/qtdragon-prepare.sh, sourced by both qtdragon test.sh files, so the quit test reuses them instead of leaving qtvcp to crash on startup. Requires the SIGTERM handlers in LinuxCNC#4076 (gmoccapy), LinuxCNC#4077 (touchy) and LinuxCNC#4078 (qtvcp); without them the GUIs ignore SIGTERM and these tests fail by design.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
gmoccapy did not exit on SIGTERM; callers had to escalate to SIGKILL.
PyGObject's signal bridge surfaces a termination signal into the GTK main
loop as a Python KeyboardInterrupt. That reached the installed sys.excepthook,
which unconditionally popped a modal "Found an error ... KeyboardInterrupt"
dialog and blocked in the dialog's nested loop, so the process never quit.
Handle KeyboardInterrupt at the top of excepthook: log it and quit the main
loop instead of showing the modal dialog. The old broken
except KeyboardInterrupton the window lookup (which could never fire there)is removed.
Surfaced in the ui-smoke review, PR #4054.
Fixes #4069
Test: SIGTERM to the gmoccapy sim under xvfb. Verified with py-spy that the
process is in the real Gtk.main loop and now exits cleanly, with no SIGKILL
escalation and no error-dialog traceback.